Scala 2.12.0-RC1 support. #177

paulp · 2016-09-08T23:40:59Z

No description provided.

ghost · 2016-09-10T13:37:14Z

As per gitter chat, I will re-introduce 2.10 to this PR so we can now cover 2.10. 2.11 and 2.12. I've donw the work already, but I really need to restructure some bit. Just a heads-up on what I'm doing

ghost · 2016-09-10T17:09:51Z

Done. Here is a git diff https://gist.github.com/BennyHill/401b44ee62f123f23b52ad56d98e5db3

Or I could push tp @paulp 's repo branch, but the changes are done.

paulp · 2016-09-11T19:33:30Z

@BennyHill I applied your patch.

ghost · 2016-09-11T20:52:31Z

@paulp 👍

sksamuel · 2016-09-12T20:58:27Z

Thanks for the PR @paulp @BennyHill
We have a branch ready to go for 1.2 to address some long standing issues. I'd like to wait on this PR until 1.3 which will support scala 2.12 and will be released immediately-ish after, is that's ok.
@gslowikowski

rorygraves · 2016-09-17T07:36:15Z

@sksamuel Where is the 1.2 branch? Can we get it out and then release a 1.3-RC1 to get all of @paulp and @BennyHill s changes in?

sksamuel · 2016-09-17T07:44:17Z

@gslowikowski has it locally.

gslowikowski · 2016-09-17T08:21:55Z

I will start merging changes today

ghost · 2016-09-17T09:17:28Z

👍

@paulp

…ly with 2.11). Details: - sbt version upgraded from 2.13.11 to 2.13.12, - scala version upgraded from 2.11.7 to 2.11.8, - scalatest version upgraded from 3.0.0-M15 to 3.0.0, - unneeded 'javaOptions += "-XX:MaxMetaspaceSize=2048m' settings removed from build, - unneeded EnvSupport class removed from build, - tests made compatible with Scala 2.10, - TravisCI configured for Scala 2.10.6 and 2.11.8. Some fixes borrowed (with modifications) from scoverage#177, thank you @paulp and @BennyHill.

gslowikowski · 2016-09-17T16:00:11Z

I've just created and merged #179. This PR has conflicts now.

I would like it to be split into separated PRs for:

logging (dependencies) improvement - scala-logging 3.5.0 is available, use this version instead of a snapshot; is scala-logging-slf4j not required anymore?
maybe separate one for other build improvements - if there are not many, they can be added to previous one
Scala 2.12 support - only the logic related to this problem; I would like this PR to be easy for anyone to read and understand, what was required for Scala 2.12 integration.

Will you prepare there PRs or should I do it myself?

paulp · 2016-09-17T16:55:10Z

All the changes in my original PR (41784d8) are to work with scala 2.12. In some cases "build improvement" was the most expeditious route to that goal.

gslowikowski · 2016-09-18T19:30:13Z

There is no com.typesafe.scala-logging:scala-logging_2.10:3.5.0 dependency. How will it work with Scala 2.10? It's used in ScoverageCompiler.scala.

ghost · 2016-09-18T19:45:37Z

@gslowikowski From gitter:

So: compiling and testing with coverage on 2.10.6 does indeed fail to compile
But... removing logging from CreditEngine fixes the issue
logging is only used in that class, and the logging lib was compiled with 2.10.4 and so should/might explain this
It is an old logging lib, unfortunately newer version (3.x) are only compiled with 2.11.x
mixing in the StrictLogging trait is ok, it's the actual call to logger.debug that is the issue
I think a good test would be if I compile the old logging lib with 2.10.6 and see if that works.
Actually, see lightbend-labs/scala-logging#30
This is an open issue >18 months at lightbend so maybe best just to dump this lib completely

This lib is only used as a test-case, not for real logging. Hence we thought best to ditch it.

gslowikowski · 2016-09-18T19:58:01Z

If you think it's not needed, we can remove it.

gslowikowski · 2016-09-18T20:01:44Z

Some code (required to run tests on Scala 2.10) from this PR was already copied by me and merged.

I would like to see two separate PRs created from this one:

one with different build improvements (like removing scala-logging, code refactoring, etc.), preparation for Scala 2.12,
second one with pure Scala 2.12 support added.

Can you do it?

gslowikowski · 2016-09-22T10:01:11Z

Some questions from me:

In plugin test classes (LocationCompiler.scala and ScoverageCompiler.scala) overridden runsRightAfter method was added in three classes extending PluginComponent (see here , here and here). Is it required? What is it for? Tests work for me without it.
In ScoverageCompiler.scala in ScoverageTestStoreComponent.runsAfter method "dce" was changed to "jvm" (see here), but there is no "jvm" phase in Scala 2.11 (see here). It's defined in 2.10, removed in 2.11 and restored in 2.12.
"jvm" removal - commit authored by @paulp
"jvm" restored - commit
BTW, it was never removed from Scalac.scala

gslowikowski · 2016-09-22T10:22:00Z

I've created #181 with different build improvements, some copied from this PR and a proposal of "clean" Scala 2.12 support introducing changes in this branch (one commit).

I'm waiting for answers to my questions above first.

paulp · 2016-09-22T14:18:06Z

I'm going to defer to others here.

gslowikowski · 2016-09-23T15:35:25Z

@sksamuel, can you take a look and try to answer my questions above?

rorygraves · 2016-09-23T16:59:08Z

@gslowikowski There is definately a jvm phase in 2.11 - type scalac -Xshow-phases but it has some special handling

paulp · 2016-09-23T17:39:36Z

@rorygraves Correct, the line which @gslowikowski linked to

    // val jvmPhase                     = phaseNamed("jvm")

has no bearing on the existence of the phase.

gslowikowski · 2016-09-23T20:52:25Z

I've updaged my branch https://github.com/gslowikowski/scalac-scoverage-plugin/commits/scala212-simplified-proposal
Tests work for all Scala versions. You can test it.

gslowikowski · 2016-09-24T17:43:09Z

Can you update this PR?

Restore these two accidentally removed tests:

scalac-scoverage-plugin/scalac-scoverage-plugin/src/test/scala/scoverage/PluginASTSupportTest.scala

Lines 79 to 93 in 989329d

    
             // https://github.com/skinny-framework/skinny-framework/issues/97 
        
             test("macro range positions should not break plugin") { 
        
               val compiler = ScoverageCompiler.default 
        
               compiler.addToClassPath("org.slf4j", "slf4j-api", "1.7.7") 
        
               compiler.addToClassPath("com.typesafe.scala-logging", "scala-logging-api_" + ScoverageCompiler.ShortScalaVersion, "2.1.2") 
        
               compiler.addToClassPath("com.typesafe.scala-logging", "scala-logging-slf4j_" + ScoverageCompiler.ShortScalaVersion, "2.1.2") 
        
               compiler.compileCodeSnippet( """import com.typesafe.scalalogging.slf4j.StrictLogging 
        
                                     | 
        
                                     |object MacroTest extends StrictLogging { 
        
                                     |  println("Hello") 
        
                                     |  logger.info("will break") 
        
                                     |} """.stripMargin) 
        
               assert(!compiler.reporter.hasErrors) 
        
               assert(!compiler.reporter.hasWarnings) 
        
             }

scalac-scoverage-plugin/scalac-scoverage-plugin/src/test/scala/scoverage/PluginCoverageTest.scala

Lines 288 to 306 in 989329d

    
             test("plugin should not instrument expanded macro code github.com/skinny-framework/skinny-framework/issues/97") { 
        
               val compiler = ScoverageCompiler.default 
        
               compiler.addToClassPath("org.slf4j", "slf4j-api", "1.7.7") 
        
               compiler 
        
                 .addToClassPath("com.typesafe.scala-logging", 
        
                   "scala-logging-api_" + ScoverageCompiler.ShortScalaVersion, 
        
                   "2.1.2") 
        
               compiler 
        
                 .addToClassPath("com.typesafe.scala-logging", 
        
                   "scala-logging-slf4j_" + ScoverageCompiler.ShortScalaVersion, 
        
                   "2.1.2") 
        
               compiler.compileCodeSnippet( """import com.typesafe.scalalogging.slf4j.StrictLogging 
        
                                              |class MacroTest extends StrictLogging { 
        
                                              |  logger.info("will break") 
        
                                              |} """.stripMargin) 
        
               assert(!compiler.reporter.hasErrors) 
        
               assert(!compiler.reporter.hasWarnings) 
        
               compiler.assertNoCoverage() 
        
             }

paulp · 2016-09-24T18:44:00Z

No, I've put what time into it I can.

rorygraves · 2016-09-24T19:13:40Z

@gslowikowski based on the the fact that half of these changes have been picked/merged separately I suggest you close this PR and manually import any other changes you are going to take.

gslowikowski · 2016-09-25T13:28:53Z

@rorygraves I didn't want to take this PR over, but at the end created #182 from my branch (which I hoped would serve for discussion about improving this one).

There are still areas for test harness improvements, but new release is more desired now. Improvements can be made at any time later.

Scala 2.12.0-RC1 support.

41784d8

paulp mentioned this pull request Sep 8, 2016

Support 2.12 #152

Closed

Patch from @BennyHill to recover scala 2.10 support.

8900828

ghost mentioned this pull request Sep 12, 2016

Use SBT settings to control scoverage scoverage/sbt-scoverage#182

Merged

gslowikowski mentioned this pull request Sep 17, 2016

Build fixes. Tests compatible with Scala 2.10 and 2.11 (previously only with 2.11) #179

Merged

ghost mentioned this pull request Sep 18, 2016

Release 2.12.0-RC1 typelevel/catalysts#2

Closed

gslowikowski mentioned this pull request Sep 19, 2016

Feature request: Scala 2.12 support scoverage/sbt-scoverage#126

Closed

dwijnand mentioned this pull request Sep 20, 2016

newer scala-logging, newer scoverage, unfreeze Shapeless, unfork Scala.js scala/community-build#288

Merged

gslowikowski mentioned this pull request Sep 25, 2016

Scala 2.12.0-RC1 support. #182

Merged

gslowikowski closed this Sep 25, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Scala 2.12.0-RC1 support. #177

Scala 2.12.0-RC1 support. #177

paulp commented Sep 8, 2016

ghost commented Sep 10, 2016

ghost commented Sep 10, 2016

paulp commented Sep 11, 2016

ghost commented Sep 11, 2016

sksamuel commented Sep 12, 2016

rorygraves commented Sep 17, 2016

sksamuel commented Sep 17, 2016

gslowikowski commented Sep 17, 2016

ghost commented Sep 17, 2016

gslowikowski commented Sep 17, 2016

paulp commented Sep 17, 2016

gslowikowski commented Sep 18, 2016

ghost commented Sep 18, 2016

gslowikowski commented Sep 18, 2016

gslowikowski commented Sep 18, 2016

gslowikowski commented Sep 22, 2016

gslowikowski commented Sep 22, 2016

paulp commented Sep 22, 2016

gslowikowski commented Sep 23, 2016

rorygraves commented Sep 23, 2016

paulp commented Sep 23, 2016

gslowikowski commented Sep 23, 2016

gslowikowski commented Sep 24, 2016

paulp commented Sep 24, 2016

rorygraves commented Sep 24, 2016

gslowikowski commented Sep 25, 2016

Scala 2.12.0-RC1 support. #177

Scala 2.12.0-RC1 support. #177

Conversation

paulp commented Sep 8, 2016

ghost commented Sep 10, 2016

ghost commented Sep 10, 2016

paulp commented Sep 11, 2016

ghost commented Sep 11, 2016

sksamuel commented Sep 12, 2016

rorygraves commented Sep 17, 2016

sksamuel commented Sep 17, 2016

gslowikowski commented Sep 17, 2016

ghost commented Sep 17, 2016

gslowikowski commented Sep 17, 2016

paulp commented Sep 17, 2016

gslowikowski commented Sep 18, 2016

ghost commented Sep 18, 2016

gslowikowski commented Sep 18, 2016

gslowikowski commented Sep 18, 2016

gslowikowski commented Sep 22, 2016

gslowikowski commented Sep 22, 2016

paulp commented Sep 22, 2016

gslowikowski commented Sep 23, 2016

rorygraves commented Sep 23, 2016

paulp commented Sep 23, 2016

gslowikowski commented Sep 23, 2016

gslowikowski commented Sep 24, 2016

paulp commented Sep 24, 2016

rorygraves commented Sep 24, 2016

gslowikowski commented Sep 25, 2016